Fixed too long lines
authorSascha Grunert <mail@saschagrunert.de>
Sat, 12 Nov 2016 09:33:59 +0000 (10:33 +0100)
committerSascha Grunert <mail@saschagrunert.de>
Sat, 12 Nov 2016 09:33:59 +0000 (10:33 +0100)
src/cargo/sources/path.rs
src/cargo/util/toml.rs

index e5a7ae6f8ce427c8568a597dccb15043af3bdc22..18e6e35da8a4db9de8296222259eab6720c3fe17 100644 (file)
@@ -94,8 +94,18 @@ impl<'cfg> PathSource<'cfg> {
                 human(format!("could not parse pattern `{}`: {}", p, e))
             })
         };
-        let exclude = pkg.manifest().exclude().iter().map(|p| parse(p)).collect::<Result<Vec<_>, _>>()?;
-        let include = pkg.manifest().include().iter().map(|p| parse(p)).collect::<Result<Vec<_>, _>>()?;
+
+        let exclude = pkg.manifest()
+                         .exclude()
+                         .iter()
+                         .map(|p| parse(p))
+                         .collect::<Result<Vec<_>, _>>()?;
+
+        let include = pkg.manifest()
+                         .include()
+                         .iter()
+                         .map(|p| parse(p))
+                         .collect::<Result<Vec<_>, _>>()?;
 
         let mut filter = |p: &Path| {
             let relative_path = util::without_prefix(p, &root).unwrap();
index ca61e3a546baeb0cf40c9a8f7c3e1828ecacbcda..c5d70b7098bd7dc2f4682896a4287ab602331117 100644 (file)
@@ -597,15 +597,21 @@ impl TomlManifest {
             }
 
             // Collect the deps
-            process_dependencies(&mut cx, self.dependencies.as_ref(), None)?;
-            process_dependencies(&mut cx, self.dev_dependencies.as_ref(), Some(Kind::Development))?;
-            process_dependencies(&mut cx, self.build_dependencies.as_ref(), Some(Kind::Build))?;
+            process_dependencies(&mut cx, self.dependencies.as_ref(),
+                                 None)?;
+            process_dependencies(&mut cx, self.dev_dependencies.as_ref(),
+                                 Some(Kind::Development))?;
+            process_dependencies(&mut cx, self.build_dependencies.as_ref(),
+                                 Some(Kind::Build))?;
 
             for (name, platform) in self.target.iter().flat_map(|t| t) {
                 cx.platform = Some(name.parse()?);
-                process_dependencies(&mut cx, platform.dependencies.as_ref(), None)?;
-                process_dependencies(&mut cx, platform.build_dependencies.as_ref(), Some(Kind::Build))?;
-                process_dependencies(&mut cx, platform.dev_dependencies.as_ref(), Some(Kind::Development))?;
+                process_dependencies(&mut cx, platform.dependencies.as_ref(),
+                                     None)?;
+                process_dependencies(&mut cx, platform.build_dependencies.as_ref(),
+                                     Some(Kind::Build))?;
+                process_dependencies(&mut cx, platform.dev_dependencies.as_ref(),
+                                     Some(Kind::Development))?;
             }
 
             replace = self.replace(&mut cx)?;